sunxi: make NAND_SUNXI use ARCH_SUNXI as default in Kconfig

Remove NAND_SUNXI from the CHIP pro defconfig to be automatically
selected depending on the state of ARCH_SUNXI.

Signed-off-by: Miquel Raynal <[email protected]>
Acked-by: Maxime Ripard <[email protected]>
Signed-off-by: Maxime Ripard <[email protected]>

diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig
index a969fc07de99f2e492a4f13fef96c5cfcb090f80..9235e34edadd8aeb523e037ed002c5a77002c959 100644 (file)
--- a/configs/CHIP_pro_defconfig
+++ b/configs/CHIP_pro_defconfig
@@ -15,7 +15,6 @@ CONFIG_ENV_UBI_PART="UBI"
 CONFIG_ENV_UBI_VOLUME="uboot-env"
 # CONFIG_MMC is not set
 CONFIG_NAND=y
-CONFIG_NAND_SUNXI=y
 CONFIG_AXP_ALDO3_VOLT=3300
 CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_CONS_INDEX=2

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 75eefc8a2b580f0cdad195cad2ee2584e7ad75bd..cf323c5348dc474f7c53cd81463c3dd5092eb1b9 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -95,6 +95,7 @@ config NAND_PXA3XX
 
 config NAND_SUNXI
        bool "Support for NAND on Allwinner SoCs"
+       default ARCH_SUNXI
        depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || MACH_SUN8I
        select SYS_NAND_SELF_INIT
        select SYS_NAND_U_BOOT_LOCATIONS